From 55cbc03ddf8045f144046366a0d17cb957b4073f Mon Sep 17 00:00:00 2001 From: robertlipe Date: Thu, 21 Feb 2013 07:07:00 +0000 Subject: [PATCH] Several mechanical changes to make CentOS less whiney during a build. --- gpsbabel/garmin_fs.cc | 11 +++-------- gpsbabel/gbser.cc | 2 +- gpsbabel/gpilots.cc | 2 +- gpsbabel/mmo.cc | 6 +++--- gpsbabel/skytraq.cc | 22 +++++++++++----------- gpsbabel/teletype.cc | 2 +- 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/gpsbabel/garmin_fs.cc b/gpsbabel/garmin_fs.cc index 58dd64b51..f75afe53d 100644 --- a/gpsbabel/garmin_fs.cc +++ b/gpsbabel/garmin_fs.cc @@ -232,12 +232,6 @@ garmin_fs_xml_fprint(gbfile* ofd, const waypoint* waypt, writer.writeAttribute("xsi:schemaLocation", "http://www.garmin.com/xmlschemas/GpxExtensions/v3 " "http://www.garmin.com/xmlschemas/GpxExtensions/v3/GpxExtensionsv3.xsd"); -// "http://www.garmin.com/xmlschemas/GpxExtensions/v3/GpxExtensionsv3.xsd" -// "xmlns:gpxx=\"" \ -// "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " \ -// "xsi:schemaLocation=\"http://www.garmin.com/xmlschemas/GpxExtensions/v3 " \ -// "http://www.garmin.com/xmlschemas/GpxExtensions/v3/GpxExtensionsv3.xsd" -// writer.writeEndElement(); #endif if WAYPT_HAS(waypt, proximity) { gbfprintf(ofd, "%*s%.6f\n", space * 2, "", waypt->proximity); @@ -280,8 +274,9 @@ garmin_fs_xml_fprint(gbfile* ofd, const waypoint* waypt, gbfprintf(ofd, "%*s\n", --space * 2, ""); } if (*addr) { - char* str, *tmp; + char* str; #if OLDGPX + char* tmp; gbfprintf(ofd, "%*s\n", space++ * 2, ""); #else writer.writeStartElement("gpxx:Address"); @@ -318,10 +313,10 @@ garmin_fs_xml_fprint(gbfile* ofd, const waypoint* waypt, #if OLDGPX tmp = xml_entitize(str); gbfprintf(ofd, "%*s%s\n", space * 2, "", tmp); + xfree(tmp); #else writer.writeTextElement("gpxx:Country", str); #endif - xfree(tmp); } if ((str = GMSD_GET(postal_code, NULL))) { #if OLDGPX diff --git a/gpsbabel/gbser.cc b/gpsbabel/gbser.cc index 9cb2fc9a9..cecaa6c72 100644 --- a/gpsbabel/gbser.cc +++ b/gpsbabel/gbser.cc @@ -68,7 +68,7 @@ static int parity_letter(char c) int gbser_setup(void* handle, const char* spec) { unsigned arg[] = { 4800, 8, 0, 1 }; - int ap; + unsigned int ap; for (ap = 0; ap < sizeof(arg) / sizeof(arg[0]); ap++) { unsigned t = 0; diff --git a/gpsbabel/gpilots.cc b/gpsbabel/gpilots.cc index 9abf748fb..56938403e 100644 --- a/gpsbabel/gpilots.cc +++ b/gpsbabel/gpilots.cc @@ -219,7 +219,7 @@ data_read(void) int trk_num = 0; int trk_seg_num = 1; char trk_seg_num_buf[10]; - char* trk_name = ""; + const char* trk_name = ""; wpt_tmp = waypt_new(); diff --git a/gpsbabel/mmo.cc b/gpsbabel/mmo.cc index d46ba9ace..c879d562b 100644 --- a/gpsbabel/mmo.cc +++ b/gpsbabel/mmo.cc @@ -173,7 +173,7 @@ static char* mmo_readstr(void) { char* res; - int len; + unsigned int len; len = (unsigned)gbfgetc(fin); if (len == 0xFF) { @@ -185,7 +185,7 @@ mmo_readstr(void) // length is number of "characters" not number of bytes len = (unsigned)gbfgetc(fin); if (len > 0) { - int ii, jj, ch, resbytes=0; + unsigned int ii, jj, ch, resbytes=0; res = (char *) xmalloc(len*2 + 1); // bigger to allow for utf-8 expansion for (ii=0; ii (int)bufsz) { + if (count > (unsigned int)bufsz) { fatal(MYNAME ": Internal error (bufsz too small)!\n"); } diff --git a/gpsbabel/skytraq.cc b/gpsbabel/skytraq.cc index f9a2f7102..afddbc9de 100644 --- a/gpsbabel/skytraq.cc +++ b/gpsbabel/skytraq.cc @@ -203,7 +203,7 @@ rd_buf(const gbuint8 *buf, int len) return res_OK; } -static int +static unsigned int rd_word(void) { int errors = 5; /* allow this many errors */ @@ -257,11 +257,11 @@ skytraq_calc_checksum(const unsigned char *buf, int len) } static int -skytraq_rd_msg(const void *payload, int len) +skytraq_rd_msg(const void *payload, unsigned int len) { int errors = 5; /* allow this many errors */ - int c, i, state; - int rcv_len, calc_cs, rcv_cs; + unsigned int c, i, state; + unsigned int rcv_len, calc_cs, rcv_cs; for (i = 0, state = 0; i < RETRIES && state < sizeof(MSG_START); i++) { c = rd_char(&errors); @@ -480,7 +480,7 @@ skytraq_get_log_buffer_status(gbuint32 *log_wr_ptr, gbuint16 *sectors_free, gbui gbuint8 sectors_free[2]; gbuint8 sectors_total[2]; } MSG_LOG_STATUS_OUTPUT; - int rc; + unsigned int rc; if ((rc = skytraq_wr_msg_verify(&MSG_LOG_STATUS_CONTROL, 1)) != res_OK) { /* get memory status */ db(1, MYNAME ": Error sending LOG STATUS CONTROL message (%d)\n", rc); @@ -769,7 +769,7 @@ skytraq_read_single_sector(unsigned int sector, gbuint8 *buf) { gbuint8 MSG_LOG_SECTOR_READ_CONTROL[2] = { 0x1B, (gbuint8)(sector) }; int errors = 5; /* allow this many errors */ - int c, i, j, cs; + unsigned int c, i, j, cs; gbuint8 buffer[16]; if (sector < 0 || sector > 0xFF) { @@ -856,11 +856,11 @@ skytraq_read_single_sector(unsigned int sector, gbuint8 *buf) } static int -skytraq_read_multiple_sectors(int first_sector, int sector_count, gbuint8 *buf) +skytraq_read_multiple_sectors(int first_sector, unsigned int sector_count, gbuint8 *buf) { gbuint8 MSG_LOG_READ_MULTI_SECTORS[5] = { 0x1D }; gbuint8 *buf_end_tag; - int cs, i, read_result; + unsigned int cs, i, read_result; if (first_sector < 0 || first_sector > 0xFFFF) { fatal(MYNAME ": Invalid sector number (%i)\n", first_sector); @@ -1128,7 +1128,7 @@ static void skytraq_set_location(void) { double lat, lng; - int i; + unsigned int i; gbuint8 MSG_SET_LOCATION[17] = { 0x36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; gbuint8 MSG_GET_LOCATION = 0x35; @@ -1338,7 +1338,7 @@ static const char *poinames[] = { #define NUMPOI (sizeof poinames/sizeof poinames[0]) int getPoiByName(char *name) { - int i; + unsigned int i; for (i=0; ishortname = (gbfgetcstr(fin)); -- 2.30.2